They should be but let's make that another ticket.  These are used throughout the site and creeps out of the scope of this ticket.