Don't reuse magic numbers.

Also adapt the patched Display.Mod so it can work with either system.