Further content type selection framework (and some IDE hand-holding)