More *-PSK refactoring
1 file changed