minor LociSet/Map cleanup, comments