This is outside the scope of your change, but actually the libs should probably not be globbed together like the rest. Thoughts?