Upstream style improvements