Refactored ResourceBundle resolver.