s4-auth-krb: Streamline and cleanup code to make it readable.