Attempting to hide the ugliness of using a dummy callsite to pass the type around - this will have to change eventually