Refactor: change map to reduce.  Remove no-op block for unknown origin.