Remove some duplication in compositing
Fix a few nits