Schedule function updates

Or rather, it shouldn't be constructing a length-25 list and doing a contains check.  Exactly how you want to fix that is up to you.