I also used this opportunity to clean up some out-of-date targets and
re-group targets by OS.