More work on instanceof for data constructors