Add support for saving special-C blocks