Removed what Briman calls 'magic numbers'.