Improved ampersand support.