The code from the previous PR had some issues with it, but, I agree that these magic numbers aren't great. I'm going to restructure things a bit and solve this permanently.