lib/3.6: whitespace fixes