Don't defer the things. Refs #19.
Merge branch 'nodefer' into tape