Move some more hooks to TargetFrameInfo