These were missed in previous passes. Also remove some logic in `draw_hair.c` that was redundant after f31c3f8114.
f31c3f8114