Support alternate --expanded-key-notation w/o '='

Support alternate --expanded-key notation, such that ```--expanded-key VALUE``` will also work
- Make```=``` optional in --expanded-key notation