Cosmetic fixes (generated source looks better; liquid template mess has become messier)