Some final (hopefully) tweak-ups.