Add back the width alignment code, which turns out to be very necessary.