While here, fix the options and make the COMMENT shorter. To build on ada:49 will require patched source.