Fix nickname prefixed commands in light of CAP support