Nothing too controversial, just incidental cleanups on the way to finally getting shatter implemented (someday). Should make every pixmap four bytes smaller on ILP32, which is pleasant; LP64 doesn't see any change though due to the struct padding rules. - ajax