Try to avoid hard-coding the 8091 port

We already have an attribute for this.

There are still hard-coded usages, but this commit is a first step.