Cleanup prefixes.
Add missing @Override annotations
Impl of Block/Item expansion