Avoid partial evaluation. Now passes package checker.