Add expected types to enumerations and other places where appropriate

Closes #730
Update `MR_deleteInContext:` usage to `MR_deleteEntityInContext:`