Remove workaround for require bug, fix bug with how -- options work