Fix Issue #372: Better system.guid implementation