BZ-1143994: improvements suggested by jonathan