Rearranged import block in Generic so that it's clear what's being exported and I don't screw up exports by accident again. Code aesthetics: more than just about looking good.