Refine some features & add spec

I agree with this version/style (using `||`) of falling back to a value in the same hash.