Oops, it seems I was a bit aggressive with the refactoring.