Clean up wrapper code a bit.

Just tidying things up a bit; realized I could be doing this smarter while walking into work this morning. :leaves: