More OOP in default parser routines