Finish refactoring undertaken by @m.puchner.