These changes are still quite mechanic to pass the test suite. We should
go over them and possibly refactor more code.