More WIP.

   Just noticed trailing whitespace is getting removed. Need to check whether
   in this case it matters.