Custom DSL builders.  Fix more inheritance issues.