Used idiomatic constructors in a couple of places.