Variable renaming, general cleanup. Don't feed state events from /initialSync twice.