Minor refactorings and cleanups.
Added mspec to framework specs.