More frame.h fiddling