
        Refactor compositing a bit to conform to modern Rust style

01ce79b