Ugh, I based this change on #235 because there's likely to be a bunch of conflicts otherwise. and the PR did a diff from master not a diff from #235. Sorry.