Overhaul.  No more embedded apache types.
Fixed conflicts.