Improve automatic target address calculation for hooks

[riesentoaster]

Further tests in morion may make target addresses unnecessary altogether, so work on this issue is paused for now.