Frame refactoring, part 2.