Cleanup

This shaves off about 8% of the total size of Syphon without making any functional changes.