Add more sanity checking
Treat dirty MVars like clean MVars

This possibly fixes #1.