Move acquisition of node reference outside macro to ensure node is referenced only...