Unified builtins2

Last time I did this, one of the list examples gave me a lot of errors... And I didn't have time to investigate what went wrong. Let's hope it won't happen again.