Add Transform state. Simplify hit testing.