Move/delete/add around some constants.