Add "explicit" to ctors where appropriate.