Minor tweaks to targeting logic.  Tried to implement AnotherTargeter... and failed.