Rearranged code so that bare expressions are magical, rather than
bare symbols.