refactoring out trivial XBlocks