I think it will be better to merge this and #105 as they are, and then fix all of those in a separate commit.