Less padding magic.