cleanup a bit

using short-circuit to avoid using the if to fix root (and other
possibly argument dependent affected functions) moving the splice in
the SSL and CORS boolean definition (now they are always real boolean)