Fix two namcap errors (one left in i686). While here, do some minor formatting enhancements.