Provide node/leaf state data in instructions

Replaces PR#937