Make everything about the stack much cleaner