some low hanging fruit

I don't know if you were planning to use the NODE_OFFSET code. If you were, I suppose you can cherry pick the 1st commit and ignore the 2nd one.