I have just pushed the attached fix for two UNRESOLVED checks at 
-O0 that I hadn’t seen.