Less magic. Better names.