There is not that much common code left for the access case, except for
debug messages. The resulting code is a lot easier to read IMHO.
Also I have no way to test the access plugin, so lets split it where it
will not get more broken.