Reorganize long reference management to minimize code duplication in upcoming PAFF...