Tighten up the common stuff.