Slimmed down 300 bytes more (~8%)

Missed a few spots last time :)