Fix some yarddoc issues
Fix some yarddoc issues
Land #3338, yardoc fixes
Land #3338 for real (see 3542f85)

The other commit ended up having a changed hash. This is a nop for
mostly accounting purposes.