[COMMIT] Reduce calls to marker_position() further, redisplay