Fix typos.
Commonize
Remove an unnecessary extra test.