Cleaned up "credential mapper" APIs. Implemented a few more credential mapper classes.