More OOP in default parser routines + minor changes