Replace a few more AUTOINSTs with implicit port connections