* Fix clearing code block on a partial invalidation * Remove unnecessary use of boost::variant * Code cleanup