Make the code more easily extensible as well as taking up less
compiled space.
Signed-off-by: NTheodore Ts'o <tytso@mit.edu>