Tweak to add generic magic which keeps compiler happy.