Velocity templates should be called for ascenedant primary types

Fix for: https://www.pivotaltracker.com/s/projects/684825/stories/79207804
Change:
final List<String> results = new ArrayList();
To:
final List<String> results = new ArrayList<>();