[PD] Adding support for "return" inside comments