This is a tiny bit slower, but probably unnoticeable.
Still, it gains some performance in other places,
saves memory, and more importantly makes for simpler
code, so it's certainly better.

Change-Id: Id1ab4f73f71acd73f5920bc729817abd22cf0d07