Prepare for some work on --key handling