Velocity templates should be called for ascenedant primary types

Fix for: https://www.pivotaltracker.com/s/projects/684825/stories/79207804
Since I'm refactoring this code to only be called once, shall I just keep it in-line?