Which gets rid of 13 redundant translation units. Definitely a good start, before I figure out how to best handle the more complicated cases. (Maintenance mode commit)