Little clean up with built-in function usages.