Added potentially-optimizing behavior to parsing