Yay for system functions (and misc improvements).