Cleanup some messiness in Defart() concerning 'yourself'.