DEP: fix small oversight in 5b269aa5.
DEP: refine BaseEngine implementation.