Remove lib parameter from _raw_main and _setup
#6547
+42
−36
Merged