[PD-dev] Adding support for "return" inside comments