RPBI: Address bthirion's comments.