osl.h.in cleanups and improvments.