Fix parser to handle arbitrarily placed keyword tokens

Fix parser to handle arbitrarily placed keyword tokens #29