(Minor optimizations)
(4.3.3)