Backing out a change that may have been hasty -- didn't consider variadic invokes