Fix off-by-one error.
Replace HS.HashSet VName with Names.
Move some modules around.