I'm not really sure why I marked it as such.
It's probably a leftover from the very confused early days of the branch, when I did that weird dance to get the pointer to the Adapter which I since changed.
Right now - I can't see anything wrong with it - thoughts?