Deprecated API usage cleanup, part2

This is hacky but it's done via providing an AllowedValuesValidator impl to setValidator in the AD builder.