[bug 905834] Updated with rdalal's suggestions.