Make decorators consistent by always having handler last.

Makes code a bit cleaner