Performance improvements

several hotspot optimizations for memory + cpu consumption
If we're changing it anyways, we also could use `Collections#singletonList()` instead.