Moved some constants around.