Use common node implementations.
Merge branch 'extract_nodes' into 0.1.x