Slight cleanup of "barge heap" code