Another set of tweaks to handle centering better.