More refactoring in cms.display.* ... again.