[misc] Reduce potential cross references