Create experimental new options API, various cleanups