Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.