Had to fire up Eagle quick and take a look at my latest design (first time using USB-C). Looks like I got lucky this time.