Changes provided by Dan Wilson, git curmudgeon ;)