Some weak tweaks; feel free to revert.