Cleanups and internal tweaks. Remove Extract tag as it is available as a function.