Further detail re my options simplification change: it won't actually prevent shadowing, it'll just not support shadowing only one of a list of names