MAINT dedup Clay Woolam's contribs (>100 commits!)