Fix and simplify *-PSK ifdef's
6 files changed