The testsuite is running on my end, so the above is technically not tested yet, but it should be the same logic unless I reordered something wrong. -- Arsen Arsenović