0.9.6: Refactored language-related functions.