Pkeyauth merge in OSXUniversal.

Can you make these single line or use braces?