Use X and X_NONE for X ∈ {LOCK, PLINTH, REMEMBERED_SET, SHIELD} to match the other settings (AVER_AND_CHECK, EVENT, STATISTICS).
Oops: sense of test was wrong way round.