More safeguarding for eventual async usage.

And another code de-duplication.