ResourceBundle is getting fat. I believe #595 should solve this once implemented, but let's keep it here for now.