Finished hco / metaform merge.   All specs now run.