On refactoring ReturnPlanParser