Added feature to support terminating non-argument options