Issue #601: optimization on binding.