Fully expand reciprocal forms.  Other minor cleanups.