Should rape be restored as an offence separate from sexual assault in the Criminal Code?