Remove TypeBuilder, I don't think it's what I want...
Fix missing break statement