Right to self-defence in homes to be 'much clearer'