Simplify code, per Niklas's suggestions.