Bugfix: non-artificial spikes not landing

Incorrect source ids were being given to detectors;
targets were then rightly ignoring the generated spikes.

Also: small coding style compliance edits.