Fix some yardoc issues
Land #3562, yardoc cleanup