autowire enhancements: providing the choice code is now optional, and an implicit choice of 'nothing' will be added for agents for which there is just one element in the markup.