Need to sort out remaining ifnames and run testsuite.