More type signature improvements from Bas van Dijk