Being consistent about use statements and a fix when __construct is on a parent class