Avoid annotation processor rework