Add Hammerhead support and a bit of cleanup to vendor