Move "attach-link" to link-aware-queue to aid in inheritance.