Remove unnecessary comments from source file.
Restore names of context macros.