Improved massage data to better handle completely free-form nodes.