Refactor ExpectNode<> to massively improve readability