Ehhhhh, it's kinda six of one, half a dozen of the other. So meh? =) Pushing (hopefully) final cleanup commit.