Code cleanup: turn some functions into one-liners.
Code cleanup: turn some functions into one-liners.

ultijlam/ovale,eXhausted/Ovale,eXhausted/Ovale,eXhausted/Ovale,ultijlam/ovale,Xeltor/ovale,ultijlam/ovale