ef133a93b0c8fd5c6e99102f2187bccc3d523db4
1c86f0c329c362f18d4d3530bbc5c6bb72c41b93
d47661f3e5e39a6ec14f716b135289e77f5e1b16
8c2e2cbe62957b776c23d685242949b23e6f04f1
1a30313ea2eb19793a5fd1ef5fe4223c44150e90
8d02cb48b205ca5b588928d2f5eb8ba0ee4d7b55
Some cleanups to prepare for the ESM port.
Pull-Request has been merged by fmuellner
Some cleanups to prepare for the ESM port.