Moved add_options_from_fields from utils to cli.

This function will never be called by anything else.