Minor cleanup.
Some code cleanup (moved slowpath out of malloc).
Update to master.