Updated some function definitions for template consistency.