Clean up SIWindow a bit.
A couple minor points of cleaning up.