BZ-0000: Fixing some issues introduced by a recent bad merge.