Another round of pom changes, trying to be more rigorous