SMap is no longer const; altogether simpler