reorganized parseHolder, removing gotos; 63/102 tests succeed