@dmbates, can we get right of the `valid*` lines now?