Whitespace changes; bare no longer uses sed -r