Restore 'comments' optimizer which was broken with refactoring optimizers. Fixes #14684. !strict due to existing code