Common interface for baseline and optimized implementations

[dhil]

Patch #168 refactors the baseline and optimized implementations. There's a lot of conditional compiling involved, thus, it would be good to have a common interface for the two, so we can compile them simultaneously.