Revised the core and shorthand form callback to fix problems found when I used library on my site