Port recent frame changes to --enable-gcc-warnings