Reformat for style checker
Remove type on val to match surrounding style
Unify port fallback logic to a single place