Refactored parsing of uses and augment statements.