Trivial commit. - More logical ordering (re-group related things). - Add missing functions: max_content_width/height.