Moved some of the core Unit functionality back up into the Unit class (now that _USER_DATA's removed).