Frames; more cleanup and simplification.