More magic-number fixes.