Added simpler checks for commandless options.