mod_s2s: rework previous logic and make it work accordingly.
mod_s2s: add missing brackets.