Extra checks on specifiers and more refactorings.
Minor stuff.