some cleanup of supplicant implementation.
More will come later, these are mostly self contained parts.