fix(NodeCursor): Removes nodeList() in favor of current

Changes are in the first commit.

The second one is code cleanup only.

fix #644