Minor adjustments of recently-changed frame functions.