Final porting.
Fixes 3 failing View tests.