Spigot patch: Simplify contains in LongHashSet along with some other minor

tweaks