Updated with suggestions from https://github.com/cantino/reckon/pull/11