Correct new compiler warnings in builtin-revert