Move everything that requires ObjectiveC stuff to the ObjC++ files in
the aqua subdirectory, where it belongs.