Grammar fixes and FunctionAnalysis.java