Various refinements. Added a non-annotated version of the syntax