More work on getting the types/solver right