Elide lifetimes
Minor cleanup in style.rs