UC-138 Simplify a bit more ...