Simplify internals.
v0.2.4