bugfixes:
    - ensure all cases of a None remote/become user are covered.
