Fix node_usage and more consistency.