Use _s in functions that are guile primitive procedures.
More cleanup of primitive procedure names.