Refactoring: Make modifyAccount() async, eliminate dangerous "||"
behavior, add a do_modifyAccount helper, remove the gross bit-flag
twiddling for something more straightforward, fix up tests.