Performance tweaks, style changes.