subrel: Fix bugs introduced with non-derived binary rel src/tgt models