Add clos-fixtures per #678.