Make compose() a bit more readable

[hinok]

It was quite hard to understand the code at the first look for me ;)

[bebraw]

Thanks. Looks good.

I'll merge this. I have to update the code examples to match this at the same time so merge will likely have to wait till tomorrow.