Re-enable optimization, materialize module earlier