Various cleanup. Add support for superclass builders.