Also, would be nice to introduce a unit test to catch this sort of thing (i.e. test for unfolding).