Reflects recent refactoring work done in nomlib (gamelib)