Minor code cleanups for supplicant handling