TBH I stopped thinking with this PR and just tried to untangle the mess into a mergable state :).

It did strike me as weird that the prefix/config is in these methods at all.