+ small code cleanup + move guiInterface call to GetEntityState refs #2154 This was SVN commit r14405.