key_commit: tweak for stephens import, new types, statement changes.