A little cleanup and reorg before attempting to refactor neopixel base class.