Improve scala regexp for def/val.