diff --git a/src/file_analysis/DataEvent.cc b/src/file_analysis/DataEvent.cc
index b1107fff16..159c8c19cd 100644
--- a/src/file_analysis/DataEvent.cc
+++ b/src/file_analysis/DataEvent.cc
@@ -19,10 +19,8 @@ file_analysis::Analyzer* DataEvent::Instantiate(RecordVal* args, File* file)
 	{
 	using BifType::Record::FileAnalysis::AnalyzerArgs;
 
-	const char* chunk_field = "chunk_event";
-	const char* stream_field = "stream_event";
-	int chunk_off = AnalyzerArgs->FieldOffset(chunk_field);
-	int stream_off = AnalyzerArgs->FieldOffset(stream_field);
+	int chunk_off = AnalyzerArgs->FieldOffset("chunk_event");
+	int stream_off = AnalyzerArgs->FieldOffset("stream_event");
 
 	Val* chunk_val = args->Lookup(chunk_off);
 	Val* stream_val = args->Lookup(stream_off);
diff --git a/src/file_analysis/Extract.cc b/src/file_analysis/Extract.cc
index ad212273c7..cbe176d4ca 100644
--- a/src/file_analysis/Extract.cc
+++ b/src/file_analysis/Extract.cc
@@ -30,8 +30,7 @@ Extract::~Extract()
 file_analysis::Analyzer* Extract::Instantiate(RecordVal* args, File* file)
 	{
 	using BifType::Record::FileAnalysis::AnalyzerArgs;
-	const char* field = "extract_filename";
-	Val* v = args->Lookup(AnalyzerArgs->FieldOffset(field));
+	Val* v = args->Lookup(AnalyzerArgs->FieldOffset("extract_filename"));
 
 	if ( ! v )
 		return 0;
diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc
index 9d55682264..d6f00e1856 100644
--- a/src/file_analysis/Manager.cc
+++ b/src/file_analysis/Manager.cc
@@ -325,7 +325,8 @@ void Manager::GetFileHandle(AnalyzerTag::Tag tag, Connection* c, bool is_orig)
 	{
 	current_handle.clear();
 
-	if ( ! get_file_handle ) return;
+	if ( ! get_file_handle )
+		return;
 
 	val_list* vl = new val_list();
 	vl->append(new Val(tag, TYPE_COUNT));
diff --git a/src/file_analysis/Manager.h b/src/file_analysis/Manager.h
index faa4fdaf33..d2f8f6f1bf 100644
--- a/src/file_analysis/Manager.h
+++ b/src/file_analysis/Manager.h
@@ -172,7 +172,7 @@ private:
 	StrSet ignored;	/**< Ignored files.  Will be finally removed on EOF. */
 	string current_handle;	/**< Last file handle set by get_file_handle event.*/
 
-	static TableVal* disabled; /**< Table of disabled analyzers. */
+	static TableVal* disabled;	/**< Table of disabled analyzers. */
 };
 
 } // namespace file_analysis