Modifier blocks. More API changes.

Marking some classes as candidates for moving to the core.