Cleaned out lots of warnings and fixed up the way Phone fields are
handled.