Add support for Nested DataMaps, remove malicious block (bug 5446).