Remove unnecessary semicolon
Better name for GEN_*_
Shorter template typename