[CS] Stop using #tap so often when it's not required