Cleanup node type

Minor cleanup after #3677