Some more stl_inc.h cleanups