Consolidate commit, intended to supersede #208 PR.