Don't always add Form and Paginator.

They are lazy loaded as needed. We don't need to force them into the
property lists.
Simplify add action code.