Refactored QCC segment parsing.  #130