Various spec-ish fixes.