Added groundwork for reparsing support (#13)