jgm Simplify code normalization, in line with spec change.

Latest commit 14ae4f3

Aug 26, 2018