Updated comments to be robust to specification refactoring.
Fixed Haddock comments.