Pulled in comments from cache/ and x86/ from code-cleanup branch