apply additional requested changes after 2nd maintainer code review (see bug 708688)