This removes and rewrites a bit of logic to not rely on
a wrapper class, ultimately simplifying the codebase.

Co-authored-by: Lucas Januario <lbjanuario@gmail.com>
Co-authored-by: Tomaz Canabrava <tcanabrava@kde.org>