Removed a number of "uninitialized member" warnings by using a template wrapper around those members.