@cprice-puppet turned out to be true, I've pushed a rebased commit to fix it. Thanks! Looks a lot nicer when its not so nested.