Optimize handling of subunit-less units by skipping some unneeded work
Authored by: klaussfreire 2016-07-03
Parent: [r13714]
Child: [r13716]