Cleaned up EditSession a little.