Fix a couple additional areas where the old default key function was being used.