code cleanup in preparation for revising "call"
Treat $# as a special case so it isn't mishandled as introducing a comment