Bug fixes to wrapper generation.  Implemented wrappers for AMOEBA.