Cleaned up post-class def wiriing of NSMAP. This will probably change at least 6 million more times in the next few days.