Support for square brackets in parameter names added.