Syntax tweaks.
Syntax tweaks.
Further template modularizing.