This show successfully underminded a lot of tropes in it's early episodes. Some of the middle ones,, not so much. So it could go either way.
That said, I appreciated the bit with Evil Cindy toying with Courtney in her room. That was the best piece of writing in this episode, even if you could argue it's leaning cliche. I'd argue that the actual cliche is the "close call" and that was being underminded here. We had the setup of a close call and the show blasted it to bits. So this particular episode is one where they returned to the earlier formula of taking us to the edge of a cliche and heading another direction.
Then again, they still milked the "close call" cliche later on, with Pat under the sink. So you get the cliche defied, but also the cliche executed, both in the same episode, I guess.