Cleaned up DEFSTRUCT a bit.