reduce the number of choice conflicts

Still two conflicts:
   <K_CONSTRAINT> in columnDeclaration()
and
   <S_IDENTIFIER> in packageDeclaration(), choice
     exceptionDeclaration()

I have put the suggested LOOKAHEAD(2), but the warnings
dont go away
12 files changed