Slight improvement.
Merged in master.