Final update from this pre-remove-smarty version