Mapping cleanup; adding details about extended mappings

Also includes some extraneous cleanup.  See commit messages for full details.