Is it acceptable to replace `trigsimp` with `simplify` here?

Alternatively, is there a way of accessing #2117 without calling `simplify` directly? @smichr?