Add support for EXTRACT(datepart FROM DATE 'yyyy-mm-dd')
Fix some indent problems