make sure we're explicitly capturing return codes in places where they are tested...