Also: Get rid of some annoying warning about initialization order.
assigned to @ptrettner
merged
mentioned in commit 38da9953