Thanks to Caros Vidal for the suggestion of hiding names rather than
using namespace, and for things related to other changes made between
0.1.1 and 0.2.0.

