Rewrites system for #18.