Tidy up the Schema Parser / Context classes.