This is in direct descend of the previous implementation. Dealing with these would rather be another refactoring, I think.