Cleanup in src/compositor/

This PR does some cleanup in `src/compositor/`.
This doesn't look right. Also, I'd put `w` and `h` in one line. The last two arguments might also fit into one line.