HOPKINS: More MAX_LINES cleanup