Move ivars into .m files.