Cool on all counts, pending commit. Also added a type hint on the $node parameter.