Minor cleanup to be more consistent with existing code
Reverted to extlibs from master