Resolved SR-8704 issue by 19217
We can remove unused nil coalescing and comments.
All committers have signed the CLA.