Add tape, allow specify replacement statement, upgrade to through2