Avoiding a merge

Couple small changes. But I'm committing them because I'm scared of
merging. Even more so than usual after our terrible encounter last time.