Separate and rewrite special form specs