Cleanup — add some constants.