Remove macro, create fullscan function, tracking down segfault