More use of manifest constants.