UML: make several more things static