(yardoc) Fix yardoc comments and others after always-stale refactoring

Some yardoc and regular comments did not reflect the change after the
refactoring. 

Also corrects non intentional removal of empty line (debugging cruft).