Merge "Cleanup: remove two stray '+', fix typos."