Cleanup the ability to lie (include build type id), fix options.