A few tweaks and slimmings.