New calcs, much cleaner auto-complete handling