Pull in John's rebase mappings.