r17294: Make the code a little cleaner. Instead of using the two