Merge "Quick compiler: reference cleanup"