Merge "Minor refactorings related to SCL constructors"