Fix space-before|after handling for block-containers (only a minimal fix, doesn't take space-resolution into account, yet)