Presentation language cleanups

Clean up some ambiguities and errors in the presentation language definition.
Fix the "syntax errors" in the language fragments used later.