Cleaned up value constructors, plus added optimized config.