Finally fixed something I've been putting off for ages because it scared me. I'll eventually get around to this: