Cleanup

Remove Paren too; this might be useful, but it does not belong in the
syntax. Sorry.