remove unnecessary wrappers.

These just obfuscate what in the hells you're actually doing.