Misc syntax issues.
Merge branch 'autorouter_port'