330: Making target() mandatory, keying mappings by target rather than source