Add nasty extras to allow creating an access point at the same time
as a link. This work desperately needs to be rationalised and revised
when the full scope of what we're having to do finally becomes clear,
but for now, just getting it working.