Tightened up validation of targets and messaging.