Always prefix node

Handling more edge cases from @nathan7's work.

cc/ @jcrugzz