Fixed more ABI breakage caused by making permit1_wait a unified implementation.