Not if we can get then into 2.2 in time.
It seems like the bugs that were created by the first refactoring have been fixed, so maybe its time to think about the next layer. When I was last working on it my big concern was option "datatypes". The existing blocks that were refactored didn't have too much variety and were mostly strings and integers which was easy enough to handle. It seems like a generic solution would involve something like what we have with ftypes (registering datatypes with their handlers) and that seemed like a lot of work. Maybe now is the time to discuss alternate ideas?