Moving a preprocessor conditional.
Returning values instead of references. This could
be trouble when modifying values or returning
large lists, so may need to come up with something better
later on.