Some magic numbers are gone.