Made all seen ifs handling reconfigure-proof.