More consistent templates for guava