#123, #143: A little more work on report cukes