changed indentation, changed lambda-list of define-condition-expander