MFC r262252:

Remove redundant code and fix a style error.