Add command line arguments to control use of NLL