If we're going to add an option anyway, why not always lock but have the flag be to choose which lock impl is used?