Cleanup for #206
coverage