Small refactoring of ASS parser