Fix using arrays in keys and values
See xp-framework/xp-framework#361
QA: Use short form and "use" statement