Assorted cheap coverage wins (#602)

2 files changed