Fixes
Move memoized parsers to modules