Reduce some redundancy

I can't get the lib to compile so it's not like I can run this to check either.