Good job abstracting these away! It's much more readable now :-)