Adapt to lack of requirement for blocks around single elements