Yes, "man" in this context is unequivocally gender-neutral. Hence my point that it's a visual irritant due to a very specific situation rather than saying it was an incorrect usage or a discriminatory term.