More tweaking of stick delay code.