Some updated types and an unused namespace argument