Added the ability to expand some special forms in preparation for TCO