Refactored part of build_master_finders_table. For ticket #136.