Downgrading to 1.6... I miss diamond operators and String switch statements.