Clean up Pane code a bit.