There are a couple of places where empty arrays are created and lists with just one element. These can be replaced by `Collections#singletonList()` or a constant array of zero length.