Renamed templateMemberExpander to templateExpander.