Reworked the searching and scanning of non-frame data to be more
extensible.