Some more derp reduction