Fully agree with OP. Butland was driving me nuts last night with the amount of time he wasted.
Because of the injury to the ref, hardly any of it was added back on either.
I'd like to see indirect free kicks (for consistent infringement of the rule) - that will make sure keepers don't play...