Some cleaning-up of alpaca forms related code.