Pushing not-psp-view-specific code into std.