Reduce suffix repetition somewhat.
Minor cleanup and comments.