Fix constant refs, fixes tests.
Update deps.
0.1.21