Remove infix keyword and fix port signatures