Some minor reorgnization of constants.

Addresses #27.