Simplify CommonJS conditions, see #34