flag qualifying fields as nonnull/final + simplify