Cleanup in src/compositor/

This PR does some cleanup in `src/compositor/`.