Sorry, I didn't mean to imply that you had hardcoded the addresses, only that you'll have to go through the process of finding the addresses anew for each build. Not an insurmountable problem (as you've shown), but making it slightly harder to automate.

However, I admit to having had time to only read through it casually, so please take any incorrect statements solely as misunderstanding on my part.