Choice and frequency measures of stimulus control following simultaneous discrimination