Move some constants, improve help messages.