[[ Bug 11928 ]] Another tweak to index calculations.