Fix oddities with magic numbers.