improve treatment of electromagnetic stress-energy tensor