bug 1077136 - implement mauro's review suggestions