A few more attribute shortcuts
Remove redundant xsl:text and call-template param
Remove redundancy in Makefile