Simplified comment parsing.

Also switched to using "-- |" to indicate comments.