Multi-line some more code blocks, to prevent overlap in the current design (fixes #44).