Update `prepare' functionality:
    
        - When it be possible, don't use variable expansion on function
          invocation. That would prevent us from exercising the tags
          indexing feature.