Added a few node types, which necessitated additional checks in expandNode.