This is the first commit of a long serious of cleanup commits.
Simple testcase included to test the slightly enhanced Interface dispatcher.