Properly supporting single-language setups