Mac: More work on generic controls.