More YARD fixups.