Coverage for #110, cleanup for #113