Show whitespace in failure diffs; other minor failures fix