Lua/ParserCombinator: Refactor