Finishing library warning-emission cleanup