I think I was unsure about whether IFs should be folded in template functions.  However with this change they're always being folded.