Adds better treatment of combined units.