Avoid node hash join planning

o Fixups around handling of relationship id arguments