revert previous, doesn't compile
Revert previous, with comment
Minor corrigenda to previous, mostly now-extraneous semicolons.