Minor rearrangment of constants.