Refactor the form code slightly, and fix bug where we forgot that PHP has a different string concatenation operator. Sigh.