wiasane: Fixed and expanded entry conditions for Scan helper functions