Prepare for refactor, Milord.
Fix failing tests, Milord.