Multisurface plasticity completed for now.

Tested substantially but this stuff is quite subtle and
there could still be bugs.

Fixes #3832