More magic-number elimination.