Simplify shlr build and some w32 fixes