Fix PSI inconsistency related to default parameters