Good find, @spaceemotion - didn't notice that portion could be simplified now.