After a long private thread, DJ and I agreed that this patch would be an improvement over the current situation of FLAGS_FOR_TARGET in case of Canadian crosses. I'm checking this in.