Rename confusing macro, use Ruby array 'literals' where possible