Changed type == 'super' to issuper, etc.