Minor form redesign.