Extending position/phase-shift tuning to motion energy neurons improves velocity discrimination