(Accidentally messed up Jaxen location)
Further code cleanup to get rid of code analysis NPE false alarms