Small repairs and cleanup, a la 96f1518 and a94e21f.
Small repairs and cleanup, a la 96f1518 and a94e21f.

jpritikin/OpenMx,jpritikin/OpenMx,jpritikin/OpenMx,mhunter1/OpenMx,mhunter1/OpenMx,mhunter1/OpenMx,mhunter1/OpenMx,jpritikin/OpenMx,mhunter1/OpenMx,mhunter1/OpenMx,jpritikin/OpenMx,jpritikin/OpenMx