'delay-loading' changes to reduce knife load-time