exclude rewritten error paths, fix indentation