Make default S_LOCK macro more robust against syntax mistakes. (I cleared these changes with David Gould a few days ago.)
