Minor refactoring in addressAnalysis.c