Start to clean up redundancies, some steps towards better augroup
organization.