Avoid using ANN. This should eventually allow us to provide stage1
builds for distributions
Replace the explicit use of lens TH with a manual class.