More consistent API in psi
Hopefully fixed KT-4339 Auto-import suggestion doesn't go away for a long time

 #KT-4339 Fixed