No matter which option we take, do we have to discriminate between function and class when annotating with decorator?