Simplify LinearLayout (perhaps relative to #484)