Tweaks to the lazy relationship hack after back porting the code to my actual application...