Reworked so conditionals are picked up anywhere within block.

Conditionals can be on same line or within the block. No positioning issues detected as yet.