Updating: improving libats/funset and libats/funmap