Merge "scale_and_extend_frame{,_nonnormative}() cleanup."