Minor optimizations for neighbor opt_level 3