* In VS functions' put the current node type first. * Cleanup and merge property and method sections.