Mod compositor consolidate shell surfaces

Targets #538.
Missing whitespace after `,` here.