Fix the build after c3f73de.

Usage of the `base' namespace for some data types is required after the M34 
rebase.