Final OCD tweaks.