Bugfix commit before branching to experiment with potential of JSON
to reduce memory consumption and to eliminate potential sources of
bugs.