Various stable, small fixes and optimizations.
Considered safe for use although it won't be tagged
as a release.