Misc: Improve code in previous merge.