fixed void versus Expression, headers, etc.