This fixes problems with caching, because sometimes we were giving the wrong answer for nested calls to `subtype'. original commit: 82e6e9d19eb277be03ffd7b91d4549a61bcd723a