Adding function header and instance variable header support.