Improve handling of direct only xblocks