More authenticate cleanups

As requested by @jadwigo in PR #1475